Merge from mainline.
authorXue Fuqiao <xfq@gnu.org>
Sun, 2 Mar 2014 08:42:35 +0000 (16:42 +0800)
committerXue Fuqiao <xfq@gnu.org>
Sun, 2 Mar 2014 08:42:35 +0000 (16:42 +0800)

Trivial merge